Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resprite of old guns #6804

Merged
merged 9 commits into from
Aug 23, 2024
Merged

Resprite of old guns #6804

merged 9 commits into from
Aug 23, 2024

Conversation

Blundir
Copy link
Contributor

@Blundir Blundir commented Jul 26, 2024 •
edited
Loading

About the pull request

Resprites PPSh, M60, MAC-15, Basira bolt action rifle, S&W revolver

Resprites PPSh and M60 mags

Gives S&W revolver actual in hand sprites and belt icon (it had literally none)

Resprites inhands sprites of guns above except mac15, they are the same.

All sprites by Crowford, discord tag sir.crow

Explain why it's good for the game

Ancient sprites bad, missing icons bad.

Before:
dreamseeker_kQ1mLJNs5n

After:
dreamseeker_cBcoztKNf3

Changelog

🆑
fix: s&w revolver now has belt/pouch and inhand icons
imageadd: resprite of mac15, m60, ppsh, s&w revolver, basira bolt action rifle
/:cl:

@Blundir Blundir marked this pull request as ready for review July 26, 2024 17:49
@github-actions github-actions bot added Sprites Remove the soul from the game. Fix Fix one bug, make ten more labels Jul 26, 2024
@efzapa
Copy link
Contributor

efzapa commented Jul 27, 2024

wood on the rifle is too shiny but thats just me, could make it look like the PPSh

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Aug 3, 2024
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Aug 4, 2024
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Aug 6, 2024
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Aug 13, 2024
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@realforest2001 realforest2001 requested a review from a team August 14, 2024 04:47
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Aug 21, 2024
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Aug 21, 2024
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Aug 21, 2024
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Aug 21, 2024
harryob
harryob requested changes Aug 22, 2024
View reviewed changes
code/modules/projectiles/gun_attachables.dm Outdated Show resolved Hide resolved
code/modules/projectiles/gun_attachables.dm Outdated Show resolved Hide resolved
@harryob harryob marked this pull request as draft August 22, 2024 16:20
@Blundir Blundir requested a review from harryob August 22, 2024 16:21
@Blundir Blundir marked this pull request as ready for review August 22, 2024 16:22
harryob
harryob approved these changes Aug 23, 2024
View reviewed changes
Copy link
Member

@harryob harryob left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i have eyes to see and those look nicer

@harryob harryob added the Sprites Approved confirmed no stray pixels label Aug 23, 2024
@harryob harryob added this pull request to the merge queue Aug 23, 2024
Merged via the queue into cmss13-devs:master with commit 168c8a7 Aug 23, 2024
28 checks passed
cm13-github added a commit that referenced this pull request Aug 23, 2024
@cm13-github
Automatic changelog for PR #6804 [ci skip]
a66629a
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@harryob harryob harryob approved these changes

Assignees
No one assigned
Labels
Fix Fix one bug, make ten more Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Blundir @efzapa @cm13-github @harryob